From: Jasper St. Pierre Date: Wed, 27 Mar 2013 17:31:43 +0000 (-0400) Subject: overview: Don't allow exiting the overview if we have a DND drag X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4198 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b689972e6779cf026d2d05172aa10c63b8a35608;p=gnome-shell.git overview: Don't allow exiting the overview if we have a DND drag Otherwise, people can drag app icons or window thumbnails out of the overview, and it just looks weird. https://bugzilla.gnome.org/show_bug.cgi?id=698484 --- diff --git a/js/ui/overview.js b/js/ui/overview.js index c3ae2bbc8..12785adc8 100644 --- a/js/ui/overview.js +++ b/js/ui/overview.js @@ -435,6 +435,7 @@ const Overview = new Lang.Class({ beginItemDrag: function(source) { this.emit('item-drag-begin'); + this._inDrag = true; }, cancelledItemDrag: function(source) { @@ -443,10 +444,12 @@ const Overview = new Lang.Class({ endItemDrag: function(source) { this.emit('item-drag-end'); + this._inDrag = false; }, beginWindowDrag: function(source) { this.emit('window-drag-begin'); + this._inDrag = true; }, cancelledWindowDrag: function(source) { @@ -455,6 +458,7 @@ const Overview = new Lang.Class({ endWindowDrag: function(source) { this.emit('window-drag-end'); + this._inDrag = false; }, // show: @@ -578,6 +582,8 @@ const Overview = new Lang.Class({ shouldToggleByCornerOrButton: function() { if (this.animationInProgress) return false; + if (this._inDrag) + return false; if (this._activationTime == 0 || Date.now() / 1000 - this._activationTime > OVERVIEW_ACTIVATION_TIMEOUT) return true; return false;